Change in openvpn[master]: mbedtls: Allow TLS 1.3 if available
A message that is not in the archive (sent off-list or not yet received): gerrit.1747746380000.If5e832866b312a2f8a1ce6b4e00d40e3dcf63681@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
to review the following change.
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
mbedtls: Allow TLS 1.3 if available
We need mbedtls_ssl_export_keying_material() to support TLS 1.3. The workaround we use for TLS 1.2 does not work for TLS 1.3.
---
M README.mbedtls
M src/openvpn/ssl_mbedtls.c
2 files changed, 13 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/42/1042/1
README.mbedtls +6 -2
@@ -26,5 +26,9 @@ ************************************************************************* -Mbed TLS 3 has implemented (parts of) the TLS 1.3 protocol, but we have disabled -support in OpenVPN because the TLS-Exporter function is not yet implemented. +Mbed TLS 3 has implemented TLS 1.3, but support in OpenVPN requires the +function mbedtls_ssl_export_keying_material() which is currently not in +any released version. It is available when building mbed TLS from source +(mbedtls-3.6 or development branch). + +Without this function, only TLS 1.2 is available.
src/openvpn/ssl_mbedtls.c +7 -4
@@ -1061,11 +1061,14 @@int tls_version_max (void ) { -#if defined(MBEDTLS_SSL_PROTO_TLS1_2 ) +/* We need mbedtls_ssl_export_keying_material() to support TLS 1.3. */ +#if defined(MBEDTLS_SSL_PROTO_TLS1_3 ) &&HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +return TLS_VER_1_3 ; +#elif defined(MBEDTLS_SSL_PROTO_TLS1_2 )return TLS_VER_1_2 ; -#else /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ -#error "mbedtls is compiled without support for TLS 1.2." -#endif /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ +#else +#error "mbedtls is compiled without support for TLS 1.2 or 1.3" +#endif }/**
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 1
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
to look at the new patch set (#2).
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
mbedtls: Allow TLS 1.3 if available
We need mbedtls_ssl_export_keying_material() to support TLS 1.3. The workaround we use for TLS 1.2 does not work for TLS 1.3.
---
M README.mbedtls
M src/openvpn/ssl_mbedtls.c
2 files changed, 13 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/42/1042/2
README.mbedtls +6 -2
@@ -26,5 +26,9 @@ ************************************************************************* -Mbed TLS 3 has implemented (parts of) the TLS 1.3 protocol, but we have disabled -support in OpenVPN because the TLS-Exporter function is not yet implemented. +Mbed TLS 3 has implemented TLS 1.3, but support in OpenVPN requires the +function mbedtls_ssl_export_keying_material() which is currently not in +any released version. It is available when building mbed TLS from source +(mbedtls-3.6 or development branch). + +Without this function, only TLS 1.2 is available.
src/openvpn/ssl_mbedtls.c +7 -4
@@ -1061,11 +1061,14 @@int tls_version_max (void ) { -#if defined(MBEDTLS_SSL_PROTO_TLS1_2 ) +/* We need mbedtls_ssl_export_keying_material() to support TLS 1.3. */ +#if defined(MBEDTLS_SSL_PROTO_TLS1_3 ) &&HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +return TLS_VER_1_3 ; +#elif defined(MBEDTLS_SSL_PROTO_TLS1_2 )return TLS_VER_1_2 ; -#else /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ -#error "mbedtls is compiled without support for TLS 1.2." -#endif /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ +#else +#error mbedtls is compiled without support for TLS 1.2 or 1.3 +#endif }/**
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 2
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: MaxF, flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
Same comment as on the previous patch applies about using the internal mbed TLS define
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 2
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Thu, 22 May 2025 13:31:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: MaxF, flichtenheld.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
to look at the new patch set (#3).
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
mbedtls: Allow TLS 1.3 if available
We need mbedtls_ssl_export_keying_material() to support TLS 1.3. The workaround we use for TLS 1.2 does not work for TLS 1.3.
---
M README.mbedtls
M src/openvpn/ssl_mbedtls.c
2 files changed, 13 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/42/1042/3
README.mbedtls +6 -2
@@ -26,5 +26,9 @@ ************************************************************************* -Mbed TLS 3 has implemented (parts of) the TLS 1.3 protocol, but we have disabled -support in OpenVPN because the TLS-Exporter function is not yet implemented. +Mbed TLS 3 has implemented TLS 1.3, but support in OpenVPN requires the +function mbedtls_ssl_export_keying_material() which is currently not in +any released version. It is available when building mbed TLS from source +(mbedtls-3.6 or development branch). + +Without this function, only TLS 1.2 is available.
src/openvpn/ssl_mbedtls.c +7 -4
@@ -1048,11 +1048,14 @@int tls_version_max (void ) { -#if defined(MBEDTLS_SSL_PROTO_TLS1_2 ) +/* We need mbedtls_ssl_export_keying_material() to support TLS 1.3. */ +#if defined(MBEDTLS_SSL_PROTO_TLS1_3 ) && defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +return TLS_VER_1_3 ; +#elif defined(MBEDTLS_SSL_PROTO_TLS1_2 )return TLS_VER_1_2 ; -#else /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ -#error "mbedtls is compiled without support for TLS 1.2." -#endif /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ +#else +#error mbedtls is compiled without support for TLS 1.2 or 1.3 +#endif }/**
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: MaxF.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Wed, 28 May 2025 09:22:20 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: MaxF.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
Patch Set 3: Code-Review-1
(2 comments)
Patchset:
PS3:
I'm confused about exact mbedTLS version numbers that I should test this against
File README.mbedtls:
http://gerrit.openvpn.net/c/openvpn/+/1042/comment/eb36c616_51198042 :
PS3, Line 32: (mbedtls-3.6 or development branch).
this 3.6 here does not look right. FreeBSD ships 3.6.2 in ports, and it does not have mbedtls_ssl_export_keying_material() (says our configure), and I downloaded mbedtls-3.6.3.1.tar.bz2 which also does not have it (says "grep -R").
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Sun, 01 Jun 2025 14:49:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: MaxF, cron2.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
Patch Set 3:
(1 comment)
File README.mbedtls:
http://gerrit.openvpn.net/c/openvpn/+/1042/comment/bf3c99be_a1c3ac1a :
PS3, Line 32: (mbedtls-3.6 or development branch).
Quoted 1 line
this 3.6 here does not look right. FreeBSD ships 3.6. […]
It is not released yet. You need the mbed TLS 3.6 development branch or the master developmenet branch. I used the 3.6 development branch since master breaks for different reasons
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Sun, 01 Jun 2025 15:41:32 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: MaxF.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
Patch Set 3: Code-Review+2
(1 comment)
Patchset:
PS3:
discussed with Arne, while a bit misleading (there is no "3.6 release" but a "3.6 development train, which will eventually see this" - something people exposed to mbedTLS know, while I didn't) the patch itself is good enough. We can put a specific version number in the README when we know one.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Tue, 03 Jun 2025 14:05:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v3 1/1 mbedtls: Allow TLS 1.3 if available
In reply to a message not in the archiveFrom: Max Fillinger <[email protected]...>
We need mbedtls_ssl_export_keying_material() to support TLS 1.3. The workaround we use for TLS 1.2 does not work for TLS 1.3.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1042
This mail reflects revision 3 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
Frank Lichtenheld <[email protected]...>
README.mbedtls +6 -2
@@ -26,5 +26,9 @@ ************************************************************************* -Mbed TLS 3 has implemented (parts of) the TLS 1.3 protocol, but we have disabled -support in OpenVPN because the TLS-Exporter function is not yet implemented. +Mbed TLS 3 has implemented TLS 1.3, but support in OpenVPN requires the +function mbedtls_ssl_export_keying_material() which is currently not in +any released version. It is available when building mbed TLS from source +(mbedtls-3.6 or development branch). + +Without this function, only TLS 1.2 is available.
src/openvpn/ssl_mbedtls.c +7 -4
@@ -1048,11 +1048,14 @@int tls_version_max (void ) { -#if defined(MBEDTLS_SSL_PROTO_TLS1_2 ) +/* We need mbedtls_ssl_export_keying_material() to support TLS 1.3. */ +#if defined(MBEDTLS_SSL_PROTO_TLS1_3 ) && defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +return TLS_VER_1_3 ; +#elif defined(MBEDTLS_SSL_PROTO_TLS1_2 )return TLS_VER_1_2 ; -#else /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ -#error "mbedtls is compiled without support for TLS 1.2." -#endif /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ +#else +#error mbedtls is compiled without support for TLS 1.2 or 1.3 +#endif }/**
[Openvpn-devel] [PATCH applied] Re: mbedtls: Allow TLS 1.3 if available
A twisty nightmare of passages, all alike... (but ignoring the eye sore, these particular #ifdef are not actually that complex, well described, and well contained).
I have removed my Acked-By: from the commit - this was more a gerrit artefact due to -1'ing and then +2'ing the patch again. Frank and the BBs tested it ;-)
Your patch has been applied to the master branch.
commit abed088c9bf3d6ab479dbe815d4d307b21b816b6
Author: Max Fillinger Date: Tue Jun 3 16:06:24 2025 +0200
mbedtls: Allow TLS 1.3 if available
Signed-off-by: Max Fillinger <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31858.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Attention is currently required from: MaxF, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
Patch Set 3:
(1 comment)
File README.mbedtls:
http://gerrit.openvpn.net/c/openvpn/+/1042/comment/f309799d_61275c63 :
PS3, Line 32: (mbedtls-3.6 or development branch).
Quoted 1 line
It is not released yet. You need the mbed TLS 3. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Tue, 03 Jun 2025 14:18:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: plaisthos <[email protected]...>
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
cron2 has uploaded a new patch set (#4) to the change originally created by MaxF. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2, Code-Review+2 by flichtenheld
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
mbedtls: Allow TLS 1.3 if available
We need mbedtls_ssl_export_keying_material() to support TLS 1.3. The workaround we use for TLS 1.2 does not work for TLS 1.3.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31858.html
---
M README.mbedtls
M src/openvpn/ssl_mbedtls.c
2 files changed, 13 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/42/1042/4
README.mbedtls +6 -2
@@ -26,5 +26,9 @@ ************************************************************************* -Mbed TLS 3 has implemented (parts of) the TLS 1.3 protocol, but we have disabled -support in OpenVPN because the TLS-Exporter function is not yet implemented. +Mbed TLS 3 has implemented TLS 1.3, but support in OpenVPN requires the +function mbedtls_ssl_export_keying_material() which is currently not in +any released version. It is available when building mbed TLS from source +(mbedtls-3.6 or development branch). + +Without this function, only TLS 1.2 is available.
src/openvpn/ssl_mbedtls.c +7 -4
@@ -1048,11 +1048,14 @@int tls_version_max (void ) { -#if defined(MBEDTLS_SSL_PROTO_TLS1_2 ) +/* We need mbedtls_ssl_export_keying_material() to support TLS 1.3. */ +#if defined(MBEDTLS_SSL_PROTO_TLS1_3 ) && defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +return TLS_VER_1_3 ; +#elif defined(MBEDTLS_SSL_PROTO_TLS1_2 )return TLS_VER_1_2 ; -#else /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ -#error "mbedtls is compiled without support for TLS 1.2." -#endif /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ +#else +#error mbedtls is compiled without support for TLS 1.2 or 1.3 +#endif }/**
Signature · 14 lines
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681 Gerrit-Change-Number: 1042 Gerrit-PatchSet: 4 Gerrit-Owner: MaxF <[email protected]...> Gerrit-Reviewer: cron2 <[email protected]...> Gerrit-Reviewer: flichtenheld <[email protected]...> Gerrit-Reviewer: plaisthos <[email protected]...> Gerrit-CC: openvpn-devel <[email protected]> Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email )
Change subject: mbedtls: Allow TLS 1.3 if available
......................................................................
mbedtls: Allow TLS 1.3 if available
We need mbedtls_ssl_export_keying_material() to support TLS 1.3. The workaround we use for TLS 1.2 does not work for TLS 1.3.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31858.html
---
M README.mbedtls
M src/openvpn/ssl_mbedtls.c
2 files changed, 13 insertions(+), 6 deletions(-)
README.mbedtls +6 -2
@@ -26,5 +26,9 @@ ************************************************************************* -Mbed TLS 3 has implemented (parts of) the TLS 1.3 protocol, but we have disabled -support in OpenVPN because the TLS-Exporter function is not yet implemented. +Mbed TLS 3 has implemented TLS 1.3, but support in OpenVPN requires the +function mbedtls_ssl_export_keying_material() which is currently not in +any released version. It is available when building mbed TLS from source +(mbedtls-3.6 or development branch). + +Without this function, only TLS 1.2 is available.
src/openvpn/ssl_mbedtls.c +7 -4
@@ -1048,11 +1048,14 @@int tls_version_max (void ) { -#if defined(MBEDTLS_SSL_PROTO_TLS1_2 ) +/* We need mbedtls_ssl_export_keying_material() to support TLS 1.3. */ +#if defined(MBEDTLS_SSL_PROTO_TLS1_3 ) && defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +return TLS_VER_1_3 ; +#elif defined(MBEDTLS_SSL_PROTO_TLS1_2 )return TLS_VER_1_2 ; -#else /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ -#error "mbedtls is compiled without support for TLS 1.2." -#endif /* defined(MBEDTLS_SSL_PROTO_TLS1_2) */ +#else +#error mbedtls is compiled without support for TLS 1.2 or 1.3 +#endif }/**
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1042?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If5e832866b312a2f8a1ce6b4e00d40e3dcf63681
Gerrit-Change-Number: 1042
Gerrit-PatchSet: 4
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged